580e8503cdbe60de6ad3be948636ae1f728a634a,server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java,VirtualNetworkApplianceManagerImpl,generateVmDataCommand,#DomainRouterVO#String#String#String#String#String#String#String#number#String#,649

Before Change


        cmd.addVmData("metadata", "availability-zone", StringUtils.unicodeEscape(zoneName));
        cmd.addVmData("metadata", "local-ipv4", guestIpAddress);
        cmd.addVmData("metadata", "local-hostname", StringUtils.unicodeEscape(vmName));
        cmd.addVmData("metadata", "public-ipv4", guestIpAddress);
        cmd.addVmData("metadata", "public-hostname",  StringUtils.unicodeEscape(vmName));
        cmd.addVmData("metadata", "instance-id", vmInstanceName);
        cmd.addVmData("metadata", "vm-id", String.valueOf(vmId));

After Change


        cmd.addVmData("metadata", "availability-zone", StringUtils.unicodeEscape(zoneName));
        cmd.addVmData("metadata", "local-ipv4", guestIpAddress);
        cmd.addVmData("metadata", "local-hostname", StringUtils.unicodeEscape(vmName));
        if (dcVo.getNetworkType() == NetworkType.Basic) {
            cmd.addVmData("metadata", "public-ipv4", guestIpAddress);
            cmd.addVmData("metadata", "public-hostname",  StringUtils.unicodeEscape(vmName));
        }else
        {
            cmd.addVmData("metadata", "public-ipv4", router.getPublicIpAddress());
            cmd.addVmData("metadata", "public-hostname", router.getPublicIpAddress());
        }
        cmd.addVmData("metadata", "instance-id", vmInstanceName);
        cmd.addVmData("metadata", "vm-id", String.valueOf(vmId));